Make rpc vs. normal calls more consistent