Refactoring AHFA state logic: t+