Remaining things that need to be fixed up to get this branch into a
basically mergeable state: remotes, commands, and the assistant