Adapted to changed internals in expression layer.