Remove &p and &l, move &P to &p.

There's no need for separate commands for Pan and Lab.