Add: a few minor improvements to the handling of enum symbols;
Fix: a coumple of bugs due to typos.