Further Travis matrix fixes.