Also some general cleanup and some minor fixes along the way.
We only rely on some of the rendering primitives and implement our Cursive-style compositor on top.