Refactor proc calls to use stacks consistently