sanitize user input, a little.

[torvista]

I have several other changes but try and avoid multiple parallel PRs and exposing my Git lack-of-knowledge.