DRY a bit
Simpler ISO 8601 mangling, to please Rhino's date parsing