In C++ library, switched to 65536 slots by default.
Minor changes