This is a major commit, probably rather too large, but anyway. There
are no tests yet, so no guarantee for correctness. But it's good
progress :-)