[JENKINS-7280] Touch-ups.