Minor syntax revisions