Merge change I6b080ffc

* changes:
  Another couple of tweaks to deal with the ragged end of standardization.