Starting visitor + grammar enhancement