Created utility function for dropping by-name-ness.

And applied it in three locations.