Clean up autoclient API some more