Finished using macros in fields of 'EDIT_CONFIG'.
Minor changes to 'EDIT_CONFIG'.