Minor cleanups to reduce some spurious differences between different