Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
Shall we fix this as part of this pull request or do you want to separate it out into a new issue?