if this has to be done, at the very least, it can be with a single regexp substitution. Can we check if that's faster?