More fixes for issues with static initializers.