Restore skip_stages support for 'html'.
Switch from more_itertools.chunked to funcy.chunk.
Remove some old TODOs, and add a few new ones.