Much better implementation.  Created a dictionary for field definitions, used by both the schema and the presentation XML.  Cleaned up both.