better scrutinizer support

With this we do not need a dependency as of #1154