Improve skip_or_save_block