ReplaceOfType now allows more optional parentheses.