Fix syntax error (Bug #13593).
Remove unused and invalid variable name (Bug #13593).
[jan] Fix closue compiler errors (Bug #13593).