SERVER-13522 Cleanup a couple of encapsulation violations and add coments.

There are no functional changes, just a cleanup.