Correct verify and remove should-swap?