One general/generic swap should suffice here.
Removing -Werror from Travis for now.