I'd actually used "__func__" everywhere, but then checked the core, and __FUNCTION__ is used exclusively.   I can change them all back if you'd like...