This reverts commit 18385728.

THis commit is broken and makes anything that uses params in the struct_code_cleanup segfault.  Will implement alternate solution.