Added nullary ctors back into case classes