Better handling for Ctrl+Space completion