Update for Rust-lang changes.
Fixup some warnings; publicly export some Resource types that were moved in the
last couple of commits.