Changing the old function reference syntax to the new one
Commenting rinari out until tramp bug is fixed.