Fix nonzero offsets upstream

All right, fixed & more fully tested this time.