More minor optimizations to maxdelta2.