Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
We're currently leaving this kind of input checking to the daemon.