Fix silly data structure reuse.