Fix default value handling in constructor
Use a more simple default value and do not identity check against it.