Finish first pass on functional coding.