Cleanups from internal review of ZooKeeperMap(Test)