Cleanup and simplify the code for the recently added "wiki" command.