Of Stacks

 #6247, take two. All those little cosmetic changes removed, and now in a single commit.