Make Boost easier to disable with minimal feature loss