Bugfix: forgot to initialize our return data structures.