Move from @logger ivar to logger method.

Tests pass. Hope is all we have. And hugs.