Funcs macros gone (#3695)

* No more FUNCS/MACROS distinction

* change the docs to not talk about MACROS since they're gone

* remove out of date comment
37 files changed