(Removed some old source code ugliness.)