I've added support to qonos to run the "hacking" tool. But that's resulting in a LOT of little tweaks like this. So I'd like to leave this alone in this PR and I'll have another one that's just adding hacking and the associated cleanups.