Untied generation of parameters to main generation, excs now don't include normal func_#### -> p_### mappings to reduce size and prevent issues.