Prettied up the layout of the ACCEL and ACCEL2 macros.