Safety commit before SpadType restructuring.