Making the mapping tables ISO 3602 compliant. (Still work in progress.)