Fix FIXME.
Remove diagnostics.
Improve validity checking of call.