Fix issue where some implied schema keys were not automatically added to complex schema definitions