[BUG] Remove enum imports from match statements (#3436)

# Overview
Importing enums is extremely bad style in Rust. This can lead to nasty
errors in the future when enum definitions change.

Please stop doing this.