[Sigh...] More Travis-CI fixes.