Improve client library generation a bit