Support some more formatting features, and refactor for post-processing