More work on name clashing with structs.