Combine some post-stack hacks into one file