More tweaking.  There are subtle inconsistencies that are making this tricky