Fixed the function dispatch mechanism (bsearch returns NULL rather then "end" in case of no match).