Add a by-hand mimic of the bigcall test... but this one works in both versions