Minor updates to @CalStruct.