Improvements for cc-mode