Remove unit

Closes https://github.com/rust-lang/rust/issues/18614.
This special case can be removed now.