Better support for multiline formatting