fixed evaluation of DISABLE_XYZ options again