SmallIntMap -> VecMap
Use a macro as MutableMap no longer exists