RE: Breakage due to CallStack refactoring