Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
True, but - to the extent that it matters - punted to later (via the more general TODO comment above)