(Settings_data.c) Macro cleanups and de-macrofy two functions