macros code cleanup
Enum field provider implicit macro removed.