Okay, just recording our conversation from last night: all of these checks pre-compilation should go away, the only thing that should prevent a catalog upgrade is an actual failure of compilation.