Fix ambiguous cal to swap (refs trac #10882)