067f3e7b94
other inconsistencies that I missed in my review of rev 1.7. Also fix a cut-n-paste error from an earlier revision.