Code cleanup round two.