Minor changes (barrier at the end and acceptance of >= 4 arguments per variable instead of ==4.
This will create a new commit in order to revert the existing changes.
