Fix formatting for matches and captures