Simplifications in Foc + minor lemmas elsewhere