Completed the regex for nonparametric function parameters, works for basic cases.