x86: better struct-within-struct support