Regenerated visitors and cleaned up the last commits/merges