Only add separator to menus when needed  (ec5941c991 and 59c2ada953)