rustc/syntax cleanups