Clean up type mapping, add new missing abstract methods, etc.
Fix test failures after rebase.