What's the purpose of this code reorganization? It seemed reasonably logical as it was. Your new layout doesn't make it clear which checks are 1.6 compatibility checks