more pattern-matching changes