This better seals off their definition. Although it did not give
much of a speedup, I think it is conceptually nicer.