Improvements to EDTypedefEnums and clarified associations throughout