Pedantic code changes in the interest of good practice.