One more fix for the travis-ci initializer script.
Rewrite a few ugly-looking lines of code.