Just FYI,

I've committed this to the 5.2 branch - zap more __func__s.  It's brutal 
but it works :-)

enjoy,
Andrew