This is API breaking (technically), but replacing ALL_ with ALL:: and ALL< with ALL::ALL< in the calling code should fix all problems (see the changes to the example programs).
ALL_
ALL::
ALL<
ALL::ALL<
This corresponds to #3 (closed).