converging ASTs, part 2: rule annotations -> rhs annotations; grammar scope for class name hints