SERVER-7175 Towards lint happiness