If you don't have much time. I can split this commit so you can merge the source list part, and keep the `SAFE_HEAP` part until you have time to test it. What do you think ?