Refactor / to use two partials

This strikes me as gratuitous indirection. Just sayin'.