Remove "self" parameter from newinstance closuremap definitions
Fix string declarations ending with multiple closing `}`s
Rename $self -> $this (left-over)
Remove "self" parameter from newinstance closuremap definitions