Remove _ from functions and variables in closures.

It looked busy and was hard to read, but it is inconsistent
with the classes.