Minor refactoring per discussion and MPO docs.