Minor updates to tweak the regular expressions.