simplify / style-tweak conditionals in wheel
Merge pull request #4737 from hulu/conditionals-wheel

simplify / style-tweak conditionals in wheel