Thanks!  I had already factored part of it but was not sure how to factor this one.  Finally figured it out, prompted by your uncomfortably (which I also shared).