+ Major parser classes overhaul.