Stack areas as well as ways. Fixes #409