- switch last users of kgcc to __cc
- whitespace cleanup