I have a possible solution for this too: split up the help function and put a part  in rpcclient.cpp and a part in init.cpp. Bitcoind can call both for now to get all the options.

That reminds me, there are some wallet-specific options as well. We don't want to show them in --disable-wallet builds.