More misc. cleanup.