Fixed a merging bug causing body type switching to lose track of correct default values.