Fix upcheck and insertion point finding.