rustc: Make match.rs simpler