I think it'd be fine to replace the special case

goal_rule

annotation with a

goal=True

attribute or something