Created attachment 13053 [details] [diff] [review] fix for both problems - I haven't done any extensive testing on this, but it *does* fix the test case
I believe my changes to your patch handle the case where the function isn't defined more rigorously. (Curse my initial laziness to not fix the TODO.) What do you think?
Norris, your fix looks good to me.
Cool. Thanks for all your help with these. You're fast with the patches! I'll run regression tests on this change tonight and check it in tomorrow if all goes well.
Sorry--a little slow on this. Checking in now.