Fixed swapping to/from pointers now that we advance them