IHC binding: refactoring.
Merge pull request #963 from paulianttila/ihc-binding-refactoring-changes

IHC binding: refactoring.