Syntactic improvements