That's fair, there's a bit of cleanup that could be done here, putting this into is_valid, etc. I think I'll roll that into the next time I make a related change, just to save on testing/reviewing overhead etc.