Rework OR part building as suggested in pull request 600, issue 593