WyIL: doing some refactoring.