Move some code around to directly reflect the dependency chain ordering.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>