Safety commit prior to some code restructuring