Fix compilation after code clean-up.