Re-arranged dependencies.