Minor user space fix for the additional stack switches around the initializers