Yes, I prefer the style of my latest commit. That said, if your preference is otherwise, I'm happy to follow it for this code base. I just wanted to get some consistency across the whole thing.