FIX: Deal with some "pylint: disable=" comments