simplify / style-tweak conditionals in __init__.py-s
Merge pull request #4743 from hulu/conditionals-__init__s

simplify / style-tweak conditionals in __init__.py-s