Patch from Jeff Davis addressing parameter usage issues