Modified fields, properties, and constructors to match winikka exactly.