Some more reorganization of the wcd mapping.