simplify / style-tweak conditionals in wheel