Clean up restricted ISO reading.
Merge pull request #1166 from unknownbrackets/perf-fix

Clean up restricted ISO reading