More robust updating of r30 in subfunctions in function splitter