Make functions with underscores in their names usable again.  #162