(cherry-picked from #32432)

Depends on #32534

CC: @kliem @tscrim

Component: refactoring

Author: Matthias Koeppe

Branch/Commit: 5f1c296

Reviewer: Travis Scrimshaw

Issue created by migration from https://trac.sagemath.org/ticket/32591