Improve handling of name collisions between parameters and top-level … #1894

Job	Run time
check-style	16s
build-and-test (ubuntu-latest)	2m 16s
test-wasm	2m 44s
build-and-test (windows-latest)	4m 56s
build-and-test (macos-latest)	2m 2s
	12m 14s

Provide feedback