Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
Absolutely - yes.