Refactor help registration mechanism a bit