make help work for async completions; tidy a bit