Minor match clause cleanup