Minor changes to regular expressions.