Restructure dead argument elimination, try #3 :-)