Refactoring encoder analyzer output, to reduce interaction with macros and to group similar variables.