Cleanup

In addition to dropping some commented-out code, this merge will make the return paths calling next() clearer and more consistent, hopefully leading to more stable (predictable?) DocPad chaining.