Cleanse after previous changes

* s/exprA/expr/g
* s/exprM/exprMax/g
* s/exprAs/exprs/
* Move atom into its right place: inside term
* Fix some comments
* Update a first batch of tests