fix tuple expressions