[corr1] various simplifications in view of pybind11 ()

Merging branch 'corr1'  into 'main'.

See merge request !954
8 jobs for main in 9 minutes and 46 seconds (queued for 3 seconds)