Add handling of string concatenation, add default initializers