Implementation of REP 143

Yes, in version 3 that will always be the case.

I version 2 that was never the case since we always had the entries. But if you would have left them out I would expect several scripts to break when trying to use them.

So I think it is cleaner to always ensure they are present.