Parse engine rewrite phase 2: t+ module AHFA numbering