Some more tweaks to class-level alignment, #define alignment, vertical alignment