WyC: looking to tidy up the front-end a little by eliminating the various resolve classes in favour of one (albeit large) type checking class.