Review current workaround for Rustc bug

[Byron]

As per #9, a workaround was introduced which shouldn't be necessary anymore once rust-lang/rust#22252 was fixed.

Possibly revert it if it turns out to be working.

[Byron]

Actually I like that 'workaround' - it makes the code a little more readable, or at least doesn't hurt it at all.