Changes based on comments by Jeremy Rice - extra comments plus catch hybrids without a space between "×" and name, also safer regexp when removing terminal parentheses.