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

Semi-arbitrary chunk. Chunking these changes to not deviate too far from your code churn guidelines.