More consistency around directive instances.