Fixing examples with single-var declarations