Remove "qo -> q:" mapping in operator-pending mode.

This obviates the need for the last two commits, which have been rolled
back.