re-add proper nouns which were lost in previous commit
optimization: add head-is-finished? as part of signature of (head-by-comps), rather than computing in-line