"improve autogen" is beyond my capacity. it sounds like it needs an upstream bugfix from autogen side, or a completely new "feature" :-(. feel free to reassign it to autogen maintainer: Andreas Schwab <schwab@suse.de>.