Improve SavePrimitive()