Fix marshalling of String/Symbol (broke completion)