TS-3080: Fix potential problem with dependency of bucket list size on external and changeable value.