gi: improve guessing target constructor