Tweaks from a read-through.