Various tweaks that may or may not be worth abstracting and submitting.