More work for supporting older linalg packages...