Some code cleanup that I did in June... *sigh*