Use new Trait types

[corranwebster]

This should perhaps wait for Enable 5.1 rather than 5.0, but we should use Union instead of Either, Map and other new trait types where appropriate.

If we can remove uses of Trait as well, that would be good.