Fix passing parameter lists to functions
Sheesh, includes.