Remove unit

Closes https://github.com/rust-lang/rust/issues/18614.
Where is the empty case handled? Is the guard extraneous?