Muparser cleanups

Nothing dramatic, just general housekeeping. See the individual commits for more information.