Misc cleanup

@JasonL900: Can you look at the "Switch to standardized alignment expression" (5a8dbb5). It changes exactly what happens a little, but I believe it's more precisely what was aimed for if I recall correctly.