Kill g-prompt. Kill x prefix. Merge both!

Control-g runs ctl-x-map, so where-is has no idea about it.
This way, prompts are not disturbed per x-map.

Control g only had goal-columns anyway, which move to Alt+s g.