Reuse some more already defined stuff

and add \r to the excluded chars in sto_to_col