Fix up mechanics printer.

Start of a PR to address #2383