JMS #14: More help cleanup