Clean up initialization order.