Fix bug in E-matching Real/Int terms.
Some cleanup, fix warnings raised by Debian packager.