Improvements to indentation in c/java mode