Tiny modification in preparation for speed improvements later.