Correctly handle entries with “empty” suites