Deal with a couple more func_code/func_defaults vs. double under code/defaults