Make before_goto/after_goto clean and small