More pattern matching changes.