9b7d5871 Improve internal generator target structure lookup 6cbf6a51 Fix internal target lookup performance regression