Another minor speed tweak