Fixes #2455 -- condition should know what variables the body has declared.