Fixing removal of unused var that was triggering important side-effects for feature detection
Fixing removal of unused vars that included multiple assignment (important side-effects)