Merge "Make an apihelp message less repetitive"