Refactor PatSynBind so that we can pass around PSBs instead of several arguments
(cherry picked from commit 893a261c8c15783c8f86c74f4e8c57df9c44a155)