Yeah, we should be fine to use the constants since we only support >=5.3 but if I make that change I want to coordinate it between Stash and StashBundle since we use similar shims in both and I want the logic to line up.