WYCS: working on better syntax for type patterns.
WYCS: minor renaming.