Implement #53. Various style improvements.