Small unicode related fix.
Consolidate and improve readers layer.