Added enum namebinding and variable declaration.