Added a new waldo variable for user structs.