Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
Cool. Will re-run the tests and when all's well get Ben to put up the tweak.