Minor refactorings of Armstrong, and a new design doc for it.