Minor style fixes, no functional change.

Related to Issue #155.