The "noqa" comments intended for getting the mccabe tool to ignore a method's complexity needed to be moved as part of this, for some reason.
Deimos