Simplified pattern matching expressions a little.