I'm not sure that this instance of cleaner invocation helps anything; this was me sort of thrashing around. I didn't [don't] understand the data flow very well. The other instance is what actually helps.