Issue #222: Cleanup the field creation code.