Improve generated stuff.