Preserve the correct shape when passing makeObject through a
ShapePreservingBuilder.
Fix the wrong order of base concating.