More work extracting locale methods