More pmove changes; oddly, I thought I had pushed these already.