Renamed FileReader to BytecastFileReader to eliminate conflict with java.io FileReader.
Others: minor code cleanup.