clean up pattern match a little.
Clean up pattern matches a bunch more.