Cleanup libsyntax a bit
auto merge of #7873 : sstewartgallus/rust/cleanup_syntax, r=alexcrichton