Refactored a bit with extractors
needParentheses fixed for tuples in infix expressions
Bug with non-user friendly name in popup fixed
SCL-5689