Minor data structure change for clarity.