smarter management of infinitive forms