make C-cC-c even smarter