WLS: Very useful progress on putting in the grammar for types.