Follow up to 577079b to fix compile errors.