Use correct function in noise evaluator.
Remove a use of NSNull where a nil is more appropriate (prevent a crash).