A bit more work on ADT codegen