Adapted to the changed behaviour of :?map commands.