[No reviewer required] Reeval iFCs

Continues pull request #40.

Review markups as agreed.