Cleanup if and unbound helper
Merge pull request #10035 from mmun/cleanup-if-and-unbound-helper

Cleanup if and unbound helper