I was noticing that too...  I'm certain it could be cleaned up, but that was far enough outside the scope of this PR that I didn't bother with it.