Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
I guess you could merge this (it does work as is) and then have Ben put up a pull request to complete the job more elegantly.  I'm about to sign off for the night :sleeping: