Simplify internal data structure.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
No - the internal data structure of the widgets is unrelated to anything HIPIE related.  It is the job of the marhsaller to marry the two...