Re-sync with the latest Mind4SE CPL-Preproc contributions.

Re-sync with the latest Mind4SE CPL-Preproc contributions.