Conform to LDML and tidy up stuff from SLDR