More cleaning up of primitive property builders.