Refactoring AHFA state logic: t+ mod AHFA renumbering