More logrus-related rejiggering