Wildcard bugfixes.
Context enhancement.