Minor cleanup stuff.