More work on the PatternReplaceFormatter