These two structs don't really need to be distinct as far as I can tell.
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>