Fixed bug introduced in previous commit 9c4d0bf609deed36e3e782023999d46e29c10f7f.
Now declarations as well as parameters are correctly handled by our fake choice detection.