Updating: handling calls to curried functions properly.