Remove extraneous syntax-class.
Minor optimizer cleanup.