This kind of aligning is against our CS (unnecessarily adds more changes to commits when indenting is changed).