Fix deadlock in static initialization of Core introduced with #2521 Do not refactor to lambda expressions as it will result in a class-initialization deadlock