And actually this is no longer needed (i see as I am merging this), because we switched to using a function closure that avoids the hacky replace anyhow.