Minor style fixes, no behavior change.
Merge pull request #641 from nico/ocd2

Minor style fixes, no behavior change.