There's so much churn coming in this code with the overall Find epic, that I'd like to to try to clean it up too heavily right away.  Let's let the dust start settling a tiny bit more and then see what the common patterns are.