Add some useful mappings; remove some old ones.