I don't love this part of the change. I find adding all those bits inline makes it harder in GDB. It makes memory management simpler, so I understand if you want to keep it.