Simplify and generalize implementation of align(). Should be very efficient on sensible platforms, and correct everywhere.