Minor syntax improvements.