Reverting back one problematic change, now numerical and control results are matching.