Addresses the errors produced by (re)moving, merging or renaming structs, fields and methods by rust-lang/rust#48149 and rust-lang/rust#51580
Fixes #1680 Hardcoded for 64-bit "trivial" size for now