adapted to Isabelle/25900fbea7ad;
fewer clones of Isabelle sources;