Fix comparisons and clean imports#907

ktf merged 2 commits intomasteralisw/alibuild:masterfrom

better_typings_2alisw/alibuild:better_typings_2Copy head branch name to clipboard