Fix up mistaken struct definition

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
Add some padding for flexibility.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>