MNT: more gracefully handle spin adding arguments to functions we override

MNT: more gracefully handle spin adding arguments to functions we override #4359