Refactoring AHFA state logic: t+ modulo AHFA numbering