Why was this moved? Did the placement of these options change upstream?

Also, there is a signing_dir here, and still left above. Is that intentional?