SmallIntMap: switch to current constructor conventions