consul: clean up comments, fix globalRPC tests