Editorial fixes from Jonathan, and make destructor spacing uniform throughout per the standard.