Add zero is even fact to new assumptions

Also some minor cleanups to nearby code.