Switch back to looking for <<foo>> as a group, so we stop getting weird spurious failures when a >> appears in the source.
Add callback as an idl-name type, since it defines a name.