Changes to make `narrow-to-defun' and `mark-defun' work properly in CC