Switching scalar fields now regenerates geometry.