Small refinements in optimizing path, still looking for reason for weird thermal behavior of test case.