RF: Simplify sparse NNLS fitting a bit more.