Fix to handle ISO 8601 duration <-> TimeSpan properly