WtfPlugin: slightly refactored