Cstyle, misc fixes.