Formatting using parens.
Added rename to Xtra.