Doing this avoids some problems that, in hindsight, were pretty obvious.