@Deimos: I really don't have as much of a problem with regexes as you think I do :)

@andre-d: As is is fine IMO. It's consistent with existing code.