Misc changes from our previous email/comments exchanges

See commit log for details… :-)