Remove another datatype null check
Add fixme note to EvaluationStrategyImpl