Re-organize some functions

Move safe/safeWith to Provers, where it belongs