Properly inject plugin name into format codes.
Quick round of static code analysis