Merge series from David Jander <david@protonic.nl>: This series fixes some coding style issues. No functional change.