IHC binding: refactoring.

No new features or configuration changes, just refactoring.