Old existing mappings now take precedence.
Code reorganization/cleanup.