Remove parameter class in favor of inline evaluations