Small refactoring: replaced code with 'getOrPut' library function
++Uncommented test when extensions are called for nested calls
++Extracted 'deparenthesizeArgument', used it where necessary