PSR2 fixes, auto-initialize variables assigned in conditional branches