Suggested patch. It does not address the third bug above (\C-SPC).