Does `singleton` provide any added convenience over calling this method with one argument? If not we should remove `singleton`.