Reduce reliance on NormalizedNodeInputStreamReader