(cherry-picked from #32432)
Depends on #32566
CC: @tscrim
Component: refactoring
Author: Matthias Koeppe
Branch/Commit: 5e5843a
Reviewer: Travis Scrimshaw
Issue created by migration from https://trac.sagemath.org/ticket/32600