Add help-arglists, break up subtasks