Update height choice when upgrading a building.  Eliminate now-redundant functions.