Declassify

Makes what can be a struct a struct (à la #140).