I really liked the construct before. I'll admit the &&= operator can be hard to read at times so I made it more explicit, while keeping the same basic flow. If it's still not quite up to snuff, let me know, and I'll rewrite it.