Add audit tag to config write operation.
Make better use of previous DEFINES in new ones.