order signature by scope size
sync commentary
sync symbols
transfer some of the niceties
tidy the tests
tame the tests
minor simplifications
refactor for containment
spread refactor goodness to mine