Fix functions in match module

This pull request fixes #6745, and in the process adds the ability to override the delimiter when calling functions that use subdict parsing.