Take 2: Fix issue #561 (bogus "Invalid Param name" error)

First attempt was both broken and ill-conceived.