Move wrapping in 'begin' to compound_procedure()