Fix safe constructor usage for Gonfalon and Gonfalon.Mask