Changing to new ast and node checking.