Fixed some testing infrastructure issues with XML and bugs found resulting
from those fixes. Rewrote InputDefinition to use an internal map instead
of individual fields for forward support.
Resolved last of code review comments.