rvm: Rework calls to RVM