fix functional::make_expr to be safe for use in composite actions