Changed expand-var to use free-identifier=? to compare given variables.