Rewrite function definitions with identifier lists.

A few functions snuck in with K&R style definitions.

Also add some missing memory frees.

(cherry picked from commit e5d0d1c5fbbc0ce44fdc720a35b499056fe60b06)