Add support for passing state arguments through to override evaluation