Tighten up structure definitions

Signed-off-by: Tom Haynes <loghyr@primarydata.com>