Preparation for merging the APIs and whatnot. Signed-off-by: David Anderson <danderson@tailscale.com>