Post-refactoring simplifications.
Add notes for Chris.