Fix inflection when baking models.

Refs #5428, #5488

That little matter of tests remains :stuck_out_tongue: