fix up a confused struct/typedef