Minor syntax improvements