Checkpoint minor refactorings en route to signature refactoring.