Unified the build (so far, tested with DPGTests; works there).