NF: Add optimal weights to C non-uniform routines.