Some misc. style cleanup.