Removing some duplication of parameter discovery instances