Further BLAS cleanup; new caveat