correct test for has one saving without lambda

The first part duplicates the surrounding conditional... but I think I'm generally confused why the substantial rearrangement of the conditions: given the test, it sounds like we should be introducing one additional check somewhere in here?