Fix performance bug in format, add paren combinator