Fix compilation after recent changes

This does not fix tests, because now they're failing with stack overflow, but it at least fixes compilation to unbreak dependant code.