WyIL: working on figuring last few bugs for #435.