Fixing the accidental erasure of templatized code and adding back the explicit classpaths