Minor code cleanup. https://bugzilla.gnome.org/show_bug.cgi?id=653206
https://bugzilla.gnome.org/show_bug.cgi?id=642084