Further simplify of type provider elaboration

Nested "if" and "do" blocks have been eliminated.