More work on the pattern matching code samples.