Some more fine tuning of CastepReader.