Trivial code style fixes

Mainly to sync mine and official repo.

No functional change.
Not a huge deal, but the tracing code won't be hit in this case.