Clean up -p handling slightly.

Change-Id: I8a5cd4a7adb0dde9d09e0cbb620874b1bca35e43
1 file changed