Make some tweaks for org-mode and c++-mode.