More work on getting structure names set properly after read.