RF: Get rid of a bit of string handling in here.