Remove defunct supervisor from riak_core.app, because I'm lame and always forget to do that.
Guard against using locks for tokens and vice versa.