Edit: Factor/To do/Static stack safety

Describe this revision: