Unified version checks where appropriate