Make hoist-consume runnable.
Make test suite at least compile again.