Minor fixes on Generator\Field class for default value escaping