Merge named sub-pattern changes from master.

See #121
Update tests to capture notices.