Revert "more ConditionalValue refactoring"

This reverts commit dfa44d2e40c177ba87951d207ecff3f49ac9c107.
Revert "refactored ifExpression in preparation for casting infrastructure"

This reverts commit bdc983a3f5277a839c65aa109086ea0d9b6e90af.