librustc cleanups

Just a couple minor cleanups and renames of librustc