Eliminate XYShape, replace it with a packed int