Convert single-field tuple structs to normal structs with handle field since rust master no longer support dereferencing them.