spillourguts gave me another haircut. I think it looks pretty good.Current bad news is that the type checker goes into an infinite loop on a straightforward but annoyingly large example that I can't seem to make any smaller without failing to trip the bug.