Revert back to consistent function definitions.

We changed this when we were fighting with JSHint. Now we've upgraded
to JSHint 1.0 and this is no longer a problem.

To reduce the diff and increase consistency, we're reverting this
change.