Add variable parameter support.

More testing!