Fill out port of check_funcall logic more completely.

This may fix #1976.