Merge "Minor refactoring in DPMS."