str-entrant fixes, +scp-fnc-validate