Add infinitive.
Partial refactoring of regular form lookup; bug fuxes, add infinitives.
Add infinitive.