Rustc/syntax cleanups