Just for this function?  

Note that the logging for (for example) waitFor will emit (under this implementation _waitFor.  I can back it all out if on balance the change is disruptive, or perhaps we should get some consensus on the mailing list?