Further, minor changes to diagfrob.