WyIL: more fixes related to #321