Add interpolation of association conditions back in, in the form of proc { ... } rather than instance_eval-ing strings