Deal with align defaults in a more consistent way