Making gen_oui a proper tool