Fix clobbering match pattern type.
Fix up pattern tree generation.

    We're no longer clobbering things with wildcards.