Added macros to deal with procedure alignment