Parse engine rewrite phase 2: t+ modulo AHFA numbering