Standardize definitions load order for Enumerable
Merge pull request #2515 from kachick/enumerable-load_order

Standardize definitions load order for Enumerable