* Some minor optimization glitches.