Minor speed improvements.