Clean up coding style conflicts.