checking in the benign parts of a big refactor