Revert "Refactor CallStack defaulting slightly"