s/number/integer in a few places.
Also (since I forgot to commit), updating rpc module to not treat all plugin calls as optional.
