Fixing autoload to be explicitly non-recursive.