More minor speed improvements.