1) Macros refactored to simplify field generation code.