syntax-only cleanups.