fixed evaluation of DISABLE_XYZ options once more because code was
duplicated