Working to reduce number of conditional complication directives, and migrate towards feature-based condtions rather than platform-based