A minor cleanup to make singleserver work again