Remove extraneous supervisor, and supservide directly from riak_core_sup.