Syntactic cleanup