Unify macros for alignment

Instead of having 4 different macros doing the same, use just one macro for all of them.