Optionalize Waila compat specific classes