more stack offset refactoring