Fixing up some interesting overflow cut-offs.