Add back in support for Struct-like choice classes, document this usage

Signed-off-by: Chris Riddoch <riddochc@gmail.com>