Address more TODO ISO comments.

(and issues arising from).

@arjclark - please review.
This was broken - it sort of worked by extracting the initial digits-only part of an ISO date-time string.  The ```re``` could  be made more rigorous, but it needs to extract old and new style cycle points.