Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
Should we not just nix these lines rather than commenting them out?