Resolve more warnings: empty block, non-nls, unused local.
5 files changed