Fixing weird generics compilation bug due to Trove version bump