Updates from recent pegex-pm major refactoring.