RF: Get rid of extraneous return variables.