Refactoring to make interactive work easier
Capturing notes from hand-inspection of changes