Get the mixlib/included/extend paradigm right