Fix handling of 'invokeExpanded' and start to do 'returnStk'.