... and make that code more readable in the process https://bugzilla.gnome.org/show_bug.cgi?id=787208