Code review comment for lp:~thomas-voss/grail/rework_cosmetics

This merge request has conflicts which it absolutely must not have.

It also has two intermingled things, Chase's new code and Thomas' cleanups. These need to go in different merge requests.