Take platform + compiler type into account for previous patch.