Clean up function names.
Spec conformance for function blocks versus statement blocks.