Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
`\S` is good enough, I think - whatever cyclers we use, they shouldn't give us ids with spaces in them.