Simpler regex and consistent use in tests * Some regex'es were compiled, others not. * No need to match "anything" (.*) at the end of a regex. * No need to match "anything" (.*) at the start of a regex, use search() instead of match(). * A regex to find a comma is overkill.