Corrects issues concerning guards in GuardedCase and refactors the MatchExpr case