Syntactical cleanup.