A few more minor code cleanup bits.