Reordered Regex cases for sorting (comparison) reasons.
Minor cleanup.