Travis: Now that it works, tidy up.

[ci skip]