Add `Proper`s for maps, and generalise existing ones. Add tests to check that the old ones can be derived.