Slight cleanup in read::read_from