refactor($interpolate): attempt to remove hacky code due to $interpolation perf improvements