WLS: almost done with the very rough initial first pass through types.