Fixes regression from otherwise a nice cleanup in:
    d2009225

Also get polarity of debug logging only with a context right.

Change-Id: Id322471f01e5656e758aefc57b0d4d5ad073ec54