Capture non-functions in caller insted of passing 0; add assert against 0.