Use add_package_path and remove_package_path instead of shifting/unshifting in our loader methods.