Upgrade to Voodoo w/o circular dep on Component and Application.