2c38be079e
Also, I made a separate macro for the current function name, which helps simplify a lot of code that uses it.