Remove unit

Closes https://github.com/rust-lang/rust/issues/18614.
This special case can probably be removed as well, but that might require reworking the loop below a bit.