[FOLD/e970511] Remove unused ADDRESS macro
[FOLD/e970511] Re-scope function to reduce pollution