Add support for option fields and clean up macro variable names