#4285: Bit of cleanup relating to data structure change.