Cleanup generateLeafPlans

The results of two acceptance tests have changed but they
are equivalent.