Simplify R-checks a bit.
Update call to renamed function.