Updating: improving INT2PROGINATS
Updating: improving the handling of macdef