[PDE] Reduce usage of PDE internals in production code

[PDE] Reduce usage of PDE internals in production code #2518