Cosmetic: unwrap several lines. Remove some more binary_to_list/1.