More mappings for 1.7.2.
Clean up imports.