Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
@benfitzpatrick - maybe you could cast your "iso eye" over this little fix too? As I recall this is only used for detecting future triggers overrunning the suite stop cycle.