Further style improvements.