Big rollup

This is a fairly large rollup, but I've tested everything locally, and none of
it should be platform-specific.