More misc cleanup.