Minor syntactic improvements.