RPCModel: Minor reorg to support existing RPC model optimization