Discriminator values in constructors, fixed #13.