Fixed parameter references

Preprocessing now replaces parameters anywhere in a line.