(SERVER-150) Cleanups based on PR feedback