Get rid of the function-or-null hack, not needed any more

Signed-off-by: Michael Livshin <dev@cmm.kakpryg.net>