Allow the struct size to change in the mapper

There is some really gnarley code in here. I need to swap the Struct
data type out for something else. It's just not a great fit anymore.
Going to do some looking around.