WYONE: making progress on fleshing out the rewrite rules for types.