Avoid transitions.
Small refactorings.
Minor cleanups.
Prefer short names.
Cruft killing.