Remove some duplicated code. GNOME HIG compliance.