rpc: Fix py-apidoc warnings

The previous commits shuffled code around using import renames as
glue. apidoc ignores import renames, however, and chokes on some
now invalid link targets.

This commit fixes the issue.