Cleanup variable initialization order.