Added support for wrapping types in parentheses