Rewrite Overclaiming Gap Statements