[MS][00000000] Refactor to move code into initializers.