The last series didn't get any attention, so this is a full re-send. These are tiny adjustements and cleanups, and the last one is an interesting micro-optimization. Please review. Thanks, Marek