Improved TWiki patterns

See also #529