CLEANUP: Synchronise with SWI-cpp.h enhancements to avoid local
definitions of the PREDICATE() and related macros.