More parser improvements (no need for "re 'eval'" anymore)