Refactorings I will discuss with Le Bohme and then squash into his commit.