Nope, I've been a little inconsistent all over the place. I'll fix it in a separate pull so it doesn't clutter this one up.