Some proof repair resulting from the refactoring

Still much more to go.