Cleanup swap_uint functions