Improved ISBN regexes, again