More scaffolding.
Remove untastful refactoring remnants.