am ec035950: Merge "Clean up -p handling slightly."

* commit 'ec035950e69badab883b5751c1059def2eea353d':
  Clean up -p handling slightly.