Assorted BINARY_ALIGN & SALT_ALIGN fixes.