Fix deserializer to handle simple return values