- Bring in some of the clean-ups to use IS_ENABLED rather than CONFIG_IS_ENABLED to make the code less error-prone.