Add squash and stash helpers