Style updates. Fixes #493.