Cleared up some pattern guards