Address a couple of the complexity specification concerns of #21