Tidy stack generation handling.
0.5.2