simplification of dorr computation after #399 solving by mathias