visitor: Initial parsing fixes.