Change bare functions so that they are represented by a single pointer.

Fixes #4808.

r? @brson