Note definitions now use named sub-patterns.

See #121