am 564aa1e8: am 3d561748: am ec035950: Merge "Clean up -p handling slightly."

* commit '564aa1e86daa6b892fa961e8554ec70cf125dc61':
  Clean up -p handling slightly.