Fix up some aesthetics ... ie, align things as they were intended.