I missed the above "struct"/"tuple" thing. Fixed now.