Fix even more stupid WITH_xyz bugs.