Make InstF parametric in IFree annotation

Chase changes around the codebase.
This allows us to avoid making the decision in the parser, which uses ()
for the IFree annotation type.