Switch to the ALIGNED macros we have universally

Simple/Trivial janitorial change