This just switches to using pattern matching rather than field
selectors, which I generally prefer.  No change in behaviour.