attempt to make \mathfmt{...} unnecessary or optional

[mmcloughlin]

The \mathfmt{...} macro makes this more difficult to use than you'd like. Try to revert to the original implementation without it.