Fold markers for new strtr stuff
Fix reference to out-of-scope var