Cleaned up classes I'm not quite ready to describe. Greatly simplified by removing explicit checks for Nullable<> types.