enumfset cleanups, including removal of parsing inside fn bodies.

From Lockwood Morris.