square away the stuff that hasn't been merged in a manual review
This fixes up f2fb48c3 (a manual merge) that has abandoned some things from PR #2407.