Add more workaround code to mktime/iso8601 entry.