Scaffr membership

Refactored some places that were coded wrong.  See commit messages for more details.