fix this to build with the recent StructType changes.