Replaced align definitions with refs to a.align