Minor improvements to Mechanics.