Preparation for upcoming changes to enyo-ilib.