Fixed parameter tracking error (wasn't properly checking for default
argument values)