Update to work done in DMDirc/Infrastructure.