After indentation was fixed by a previous commit some lines became too long. Re-wrap to shorten them.