WyC: continuing to work through valid test cases removing using of $, and replacing with type patterns.