Add missing immutable declarations

Signed-off-by: Stefan Marr <git@stefan-marr.de>
Avoid pop when not necessary, but might keep objects alive, let them escape

Signed-off-by: Stefan Marr <git@stefan-marr.de>