Oops, some leftovers. I should check my commits more carefully for things like this ;-)