So I took a look at this... what is the difference between this and TeaMoe's commit in your mind? I'm not sure I like creating an arbitrary constant here (even if you're checking that this constant doesn't already exist), but I'm curious now, what was the rationale here?