more Travis syntax cleanup work