Add with-eval-after-load wrappers (suggested by elint'ing the buffer)
Improve code thanks to Elint warnings
Remove code for editing Mercury programs