Simplify some really dumb stuff in NsfReader