The other method, "Save as a new node then edit" is not caught by the line:

if ($method == 'prepopulate') {

Changed it to:

if ($method == 'prepopulate' || $method == 'save-edit') {

And that seems to work.