* fixes #21116; always mangles the param * idOrSig * fixes tests * Apply suggestions from code review