Add jasy field safepromises and clean up unsafe<->safe code