(Part of the next commit.)