How do people feel about getting rid of

@goal_rule

? We currently check that a rule is a

@goal_rule

iff it returns a

Goal

, so we might as well just use that as the differentiator directly?