* Revert to older p1/p2 features, so that prev_edit features work. Clarify scoping on ternary conditional.