One bug killed.  Some more remain I think.
I think some of these woes involved with -expanded are resolved.  Still clunky but generalized a few things.