Code style fixes. Nothing semantic.