Oops, left some old stuff in there, pointed out by
@awiddersheim