WyIL: working on #379