Fix "assembled" model.

When rearranging the model to make tweaking it easier, I reverse the
order of two variables that were dependent on each other.

Fixed that.