Clean up the proof terms with implicits