Work on reserved word overhaul