Can you break this out as a function in schema.core to match set-fn-validation!  (This also reflects I think).