Minor cleanups

Minor cleanups to the recent config improvements from @tychoish.