r12731: Simplify and re-implemenet support for --parameter-name=foo