Unparse: removed unnecessary parens and #1