Rewrote matches using idiomatic rust

Created by: ecoulson

Summary

There were cases where the lexer was not taking advantage of the methods provided by Option and Result, which led to excess boilerplate code