Parser and commenting tweaks