Include empty symbol in variable enumeration

Please merge into 6.0.