Fix style inconsistencies. Fixes #172.