Pedantic code changes.